Git squash

First, you need to figure out which commits you want to squash, you can log your commits:

git log -n 5 --pretty=oneline

Then you can count how many you want to squash, let's squash the last three:

git rebase --interactive HEAD~3

or use the commit hash from the one commit before the one you want the squash to start from:

git rebase --interactive 63881f09fb08036e0b96db05f5654323312df3f2

Then you can let the commit you want to start from stay as pick and change the ones afterward you want to include to s.

Save, close the file, update the commit message, and you are done.